Merge from emacs-24; up to r108160
authorGlenn Morris <rgm@gnu.org>
Fri, 5 Oct 2012 07:38:05 +0000 (00:38 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 5 Oct 2012 07:38:05 +0000 (00:38 -0700)
commit648b2e30b3e4f2d83fb85301cca9c64258f6d665
treeececfca9bd8c183960e20561c1a7247f3579e510
parenta60b0b48c17f0e8d5795734bfcb5a4e199c65b50
parent0d4cd252c1023d7e85a937a2d6040ac7ae8eafb5
Merge from emacs-24; up to r108160
14 files changed:
doc/lispref/ChangeLog
doc/lispref/functions.texi
doc/misc/ChangeLog
doc/misc/calc.texi
doc/misc/cl.texi
etc/ChangeLog
lisp/ChangeLog
lisp/color.el
lisp/emacs-lisp/timer.el
lisp/files.el
lisp/ido.el
lisp/net/newst-treeview.el
src/ChangeLog
src/minibuf.c